From 7949073dd5e3ab8673883fb0c140d2ba01948b64 Mon Sep 17 00:00:00 2001 From: Benjamin Otte Date: Mon, 20 Dec 2010 15:42:37 +0100 Subject: [PATCH] x11: Move display-specific APIs into gdkx11display.h --- gdk/Makefile.am | 1 + gdk/x11/Makefile.am | 1 + gdk/x11/gdkx.h | 38 +------------------- gdk/x11/gdkx11display.h | 80 +++++++++++++++++++++++++++++++++++++++++ 4 files changed, 83 insertions(+), 37 deletions(-) create mode 100644 gdk/x11/gdkx11display.h diff --git a/gdk/Makefile.am b/gdk/Makefile.am index db744c25e6..67e7b6a925 100644 --- a/gdk/Makefile.am +++ b/gdk/Makefile.am @@ -217,6 +217,7 @@ x11_introspection_files = \ x11/xsettings-common.c \ x11/gdkx.h \ x11/gdkx11cursor.h \ + x11/gdkx11display.h \ x11/gdkx11screen.h \ x11/gdkx11visual.h \ x11/gdkx11window.h diff --git a/gdk/x11/Makefile.am b/gdk/x11/Makefile.am index f6982d413a..963d81b8fe 100644 --- a/gdk/x11/Makefile.am +++ b/gdk/x11/Makefile.am @@ -77,6 +77,7 @@ libgdkinclude_HEADERS = \ libgdkx11include_HEADERS = \ gdkx11cursor.h \ + gdkx11display.h \ gdkx11screen.h \ gdkx11visual.h \ gdkx11window.h diff --git a/gdk/x11/gdkx.h b/gdk/x11/gdkx.h index 2a5799aa60..e579bdc61f 100644 --- a/gdk/x11/gdkx.h +++ b/gdk/x11/gdkx.h @@ -56,6 +56,7 @@ #define __GDKX_H_INSIDE__ #include +#include #include #include #include @@ -64,15 +65,11 @@ G_BEGIN_DECLS -Display *gdk_x11_display_get_xdisplay (GdkDisplay *display); - #ifndef GDK_MULTIHEAD_SAFE Window gdk_x11_get_default_root_xwindow (void); Display *gdk_x11_get_default_xdisplay (void); #endif -#define GDK_IS_DISPLAY_X11(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), g_type_from_name ("GdkDisplayX11"))) - #ifndef GDK_MULTIHEAD_SAFE /** * GDK_ROOT_WINDOW: @@ -82,29 +79,11 @@ Display *gdk_x11_get_default_xdisplay (void); #define GDK_ROOT_WINDOW() (gdk_x11_get_default_root_xwindow ()) #endif -#define GDK_DISPLAY_XDISPLAY(display) (gdk_x11_display_get_xdisplay (display)) - -guint32 gdk_x11_display_get_user_time (GdkDisplay *display); - -G_CONST_RETURN gchar *gdk_x11_display_get_startup_notification_id (GdkDisplay *display); -void gdk_x11_display_set_startup_notification_id (GdkDisplay *display, - const gchar *startup_id); - -void gdk_x11_display_set_cursor_theme (GdkDisplay *display, - const gchar *theme, - const gint size); - -void gdk_x11_display_broadcast_startup_message (GdkDisplay *display, - const char *message_type, - ...) G_GNUC_NULL_TERMINATED; - #ifndef GDK_MULTIHEAD_SAFE void gdk_x11_grab_server (void); void gdk_x11_ungrab_server (void); #endif -GdkDisplay *gdk_x11_lookup_xdisplay (Display *xdisplay); - /* Functions to get the X Atom equivalent to the GdkAtom */ Atom gdk_x11_atom_to_xatom_for_display (GdkDisplay *display, @@ -122,21 +101,6 @@ Atom gdk_x11_get_xatom_by_name (const gchar *atom_name); G_CONST_RETURN gchar *gdk_x11_get_xatom_name (Atom xatom); #endif -void gdk_x11_display_grab (GdkDisplay *display); -void gdk_x11_display_ungrab (GdkDisplay *display); - -void gdk_x11_display_error_trap_push (GdkDisplay *display); -/* warn unused because you could use pop_ignored otherwise */ -G_GNUC_WARN_UNUSED_RESULT gint gdk_x11_display_error_trap_pop (GdkDisplay *display); -void gdk_x11_display_error_trap_pop_ignored (GdkDisplay *display); - -void gdk_x11_register_standard_event_type (GdkDisplay *display, - gint event_base, - gint n_events); - - -void gdk_x11_set_sm_client_id (const gchar *sm_client_id); - gint gdk_x11_display_text_property_to_text_list (GdkDisplay *display, GdkAtom encoding, gint format, diff --git a/gdk/x11/gdkx11display.h b/gdk/x11/gdkx11display.h new file mode 100644 index 0000000000..634f05b8f1 --- /dev/null +++ b/gdk/x11/gdkx11display.h @@ -0,0 +1,80 @@ +/* GDK - The GIMP Drawing Kit + * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + */ + +/* + * Modified by the GTK+ Team and others 1997-2000. See the AUTHORS + * file for a list of people on the GTK+ Team. See the ChangeLog + * files for a list of changes. These files are distributed with + * GTK+ at ftp://ftp.gtk.org/pub/gtk/. + */ + +#if !defined (__GDKX_H_INSIDE__) && !defined (GDK_COMPILATION) +#error "Only can be included directly." +#endif + +#ifndef __GDK_X11_DISPLAY_H__ +#define __GDK_X11_DISPLAY_H__ + +#include + +#include +#include + +G_BEGIN_DECLS + +#define GDK_IS_DISPLAY_X11(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), g_type_from_name ("GdkDisplayX11"))) + +Display *gdk_x11_display_get_xdisplay (GdkDisplay *display); + +#define GDK_DISPLAY_XDISPLAY(display) (gdk_x11_display_get_xdisplay (display)) + +guint32 gdk_x11_display_get_user_time (GdkDisplay *display); + +G_CONST_RETURN gchar *gdk_x11_display_get_startup_notification_id (GdkDisplay *display); +void gdk_x11_display_set_startup_notification_id (GdkDisplay *display, + const gchar *startup_id); + +void gdk_x11_display_set_cursor_theme (GdkDisplay *display, + const gchar *theme, + const gint size); + +void gdk_x11_display_broadcast_startup_message (GdkDisplay *display, + const char *message_type, + ...) G_GNUC_NULL_TERMINATED; + +GdkDisplay *gdk_x11_lookup_xdisplay (Display *xdisplay); + +void gdk_x11_display_grab (GdkDisplay *display); +void gdk_x11_display_ungrab (GdkDisplay *display); + +void gdk_x11_display_error_trap_push (GdkDisplay *display); +/* warn unused because you could use pop_ignored otherwise */ +G_GNUC_WARN_UNUSED_RESULT gint gdk_x11_display_error_trap_pop (GdkDisplay *display); +void gdk_x11_display_error_trap_pop_ignored (GdkDisplay *display); + +void gdk_x11_register_standard_event_type (GdkDisplay *display, + gint event_base, + gint n_events); + +void gdk_x11_set_sm_client_id (const gchar *sm_client_id); + + +G_END_DECLS + +#endif /* __GDK_X11_DISPLAY_H__ */ -- 2.30.2